Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Jun 2006 10:03:51 +0000 (11:03 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 7 Jun 2006 10:03:51 +0000 (11:03 +0100)
commit26229f1699e0c38ec4655b2f104a649ca1e7eb69
tree8bbee693f99320d8e8a5ae4def8064a1ceaa3909
parente41ca46ee754d5b1a4169906792dac2136e6a309
parentfa50dd1a8e15ca1e7d8455afe02830598edcde69
Merged.